From 3f8a3987bc44a1115ef253b504358b662809f55b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 10 May 2013 19:17:45 -0700 Subject: [PATCH] * lisp/emulation/edt-mapper.el: In batch mode, error rather than hang. --- lisp/ChangeLog | 2 ++ lisp/emulation/edt-mapper.el | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15562a0bfcd..0cac85f2e1f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-05-11 Glenn Morris + * emulation/edt-mapper.el: In batch mode, error rather than hang. + * term.el (term-set-escape-char): Make it idempotent. 2013-05-10 Leo Liu diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index 5ddb9513f0a..138e3e6d0da 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el @@ -96,6 +96,10 @@ ;;; Code: +;; Otherwise it just hangs. This seems preferable. +(if noninteractive + (error "edt-mapper cannot be loaded in batch mode")) + ;;; ;;; Decide Emacs Variant, GNU Emacs or XEmacs (aka Lucid Emacs). ;;; Determine Window System, and X Server Vendor (if appropriate). -- 2.30.2